More work on #548