Fix for special dates