Fixed perpetual 'Got first data sample' problem