Fix coordinates bug

Change-Id: Iaa38d76ada7732f071936b2e3ec3a7e730fcd56f