fixed remote resolve bug