Yet another fix for the remoting