Added an option to ignore short dates