missuse of location fixed again