Ugly handler fix