Work around MultipleObjectsReturned error