More work on #913
More work on #913