Issue 640
