fixed location issues