Added back in custom object check.
Possible fix for super call.