Fixed borked aeed4711845516c0b201673d9fd7d3d42a06ffdb, refs #942