Fixed error with empty values