actually fixed location bug this time