Fixed bug if no date is present