Fix issue with blank values