Update to Forge #1024