Fix helper to dynamically add order