Fixed bug with empty values option