fixed handler duplication