Fix for date exceptions