More work on #913