Fix default handler