Refs #47: fix for 2.x