Fixed duplicate ordering