fixing bug fixe's fixes