Use the old school handler too