Engine: fixes #3730 async-fix - re-applied change from OpenStruct to Class