fixed forward bug