force end event fixes #13