Tweak to ensure proper date format