added proper incursion check