issue 670

Issue 670