Before fixing location finder