- initial fix to remoting complete