Also implement fix for #412 for forge

Signed-off-by: Ross Allan <rallanpcl@gmail.com>