Bug refs #1524: fixed