Bugs about location fixed