Addressing issue fix

Addressing issue fixed