Fix #677
Merge pull request #682 from soyuka/date-patch

Fix #677