Fixed Bugs
Bug fixes