fixed bugs

fixed bugs