Fix ordered bug