Yeah this was one of several major issues fixed in this PR.