Added missing return
Fixed wait for cpt