fixed bugs
fix