Make sure we send end callback reliably (?)