better restart, fix trap