Fix in remote-id option support (bug #299)