Issue refs #1519: done, Bug refs #1525: fixed