fixing bug ?