issue 542

Issue 542