Fixing location bug, #53