Fix forge support - closes #312