Fix Handler::create