prepare 1.1 release
avoid duplication of handlers