fixing last commig