[Ben]: modify formula for pq pq qr
[Ben]: modify formula for pq pr or ps qr to fix bug