duplicated handler fix