Bug fixed
Bug fixing, still WIP