VID-1453 Make sure to double quote the default