fixed location bugs