Engine: fixes #3730 - async-fix - re-applied change from OpenStruct to Class
Merge pull request #3418 from thomasmckay/async-fix

async-fix - re-applied change from OpenStruct to Class