resolving check-in issues