issue 642

Issue 642