Fixes button handlers event type