Update to forge #1180