start fixing bug