fix location with new file-based stuff