fixed remote stuff