remove workaround
wrap order criterion into class