Fixed markAsReturned