Fix advance not being emitted