Fix so handlers now work