GPS fix
Can't think of anything better to call this patch right now..

Change-Id: Iebce73c5abf5c1ec99d655604f88746cae02131f