Ajay | #0000 | Correcting prefix locaton