Issue 607
