fixed duplicate handler