fixed bugs commit