Issue 647
