Fixed issue with 'blank' data