Issue 654
