fixed remote and local callbacks