Hackish patch for Builder date