More work on #336