Fixing call back issue on locaton updates