Make next_feature aware of changing parent