More work on #417