fix forward issue