fixed Bugs