Grouping issue for this kind of problem. I made some changes for 5.1.0, but it appears that the issue is still there, #558 in 5.1.1.