Bug refs #1782: fixed