Quick fix for multiple objects returned problem, part 2.