fix remote/local