Issue #202: Fix order