Fix to get better backward context