Fix setup time
Fix start detection