Fix forge support with new protocol - closes #407