Fixed checkin and checkout save