Fixing location stop bug