Team Checkin bug fix