Updated based on order loading issue https://github.com/bredikhin/barrels/issues/9