Compatibility with Hangar Patch 9