Further tweak to avoid stdClass error.