Back to more aggressive active tracking
Added extra read into empty buffer to double-check for EOF