Fix for date crash