fix location methods