Correctly maps dates