fixed bugs2!