Don't unbind after an unexpected event
Version to 2.5.4.1