fixed bugs2