Finish up Forge support - yay. 50% chance this works. Fixes issue #111