Fixed frozen date implementation