Bug refs #1526: fixed