work on #907