Fix forge support - #111