Initial fix for FORGE-1030.

Ignored test case not working yet, need some help with how testing should work for complex cases.