Bug fix, dont insert Condition after ordering