Fixed an issue with remoting