bugfix : location