Overshoot problem should be fixed -- Yeech