Fix for location encoding problem
Fix merge conflict