Fix local & remote call