Bugfix in with_deleted