Fixing bug ..