Bug refs #1550: fixed