remote sampling fix