extrapolation bug fixes