Fixed clicking bug
Added proper reset