Fix for loading date