Fix for timezone issue with date parsing