Fixed bug, I should test before checkin