Current sampling fix