Fix check in/ check out