fixed bugs
bug fix