Hotfix for MissingAttribute bug