Corrected start/stop overflow bug