Fixed bug in check in and checkout