Switch members in EntityItemProperties to hack around corruption bug