Maybe this will be better - more on #650.