fix on remote and local commands