Fixed checkin checkout problem