fixed bugs: