Fixed issue with blank dates