Fix obstacle issue