fixed last commits