attempt to fix SuperState/UserState