Merge pull request #1618 from alexanderkyte/remoting-fix