Ashwin | #3344 | Fixing location level bug.