Date plugin fix