Bug refs #1891: fixed