fixed small bug with empty values