Progress on #657; Fixed #658