Refs #74: fix for 2.x