VID-1281 Make sure we return an array