fix forward bug