Fix start/stop ts