[BUGFIX] Object monkey-patching done properly