Bugfix order vs order wrapper