Patch for date issue