Bug refs #1674: fixed