fixed previous checkin issues

fixed previous checkin issues