Ajay | #3141 | Refactored to use local variable