Checkin bug fix