Fixed state issue for non-interpolation