upgrades return [] instead of nil