Fixed errors - backpatch

Duplicate Review - error fixed