Removed check for empty values