Fixes issues with dist order.