Hotfix for structural mishap