fix default handler