End-on-start fix