PLA-833 order change, which was causing bug