Fix extrapolation