Fix map checkin handler