PR for code review

Placed it po outside if else statement po.