Integrating the fixed version of remoting