Fix for non-timestamp dates