Fix bug that prevend using a default handler