fixed bugs last commits