EMM-573 : Resolved the issue with location object going as 0