Helpers expand + hotfix