Fix for cal date