Fix bug with empty values