finish off work on #683