Fix duplicate handler notification issue in 1.2 devel