refs #445 - fix for 2.0