Fuel is injected by energizing a solenoid of a fuel injector for an on-time that terminates at a first end-of-current timing. An end-of-current trim is determined at least in part by estimating a duration between an induced current event in a circuit of the solenoid and a valve/armature interaction event. An induced current event occurs when an armature abruptly stops, and a valve/armature interaction event occurs when the armature couples with or de-couples from the valve member. Fuel is injected in a subsequent injection event by adjusting the end-of-current timing by the end-of-current trim.