Fixed issue #16

This should hopefully fix the issue with having the wrong date as
reference to history/future dates