Thanks Ribasushi! I've refactored to make two populate calls, and that works fine for me. I didn't measure the performance difference, but I can leave a note for future maintainers that if the bug is fixed they can use one populate call to improve performance.