back forward bug fix, attempt 2