Issue 672
