Bug refs #1522: fixed