Fix the remote delegation