Issue 712
