Fix to enable the default handler no matter what.