Fix #906

closes #906