Fix remote and empty function.