order: actually fixed that bug
order: fixing the bug, for real