Fix for Location
Merge branch 'compile_location' into tess2