More work on #670