Attempt a fix via select_related