fixed bugs as a group after merging