That's good. The fix that I have is indeed in a piece of code that changed for 5.1 to account for lazy fetch groups.