Fix for on_cancel with selection extensions