Improvements on sensitivity on cancel finish contact events