fix forward bugs