Bug refs #1685: fixed