Bug refs #1558: fixed