Bugfix with new admin ordering