Hotfix for expansion bugs