fixed bugs"