fixing bug123