Issue 724