Fix inactive handlers staying at finished state
#2738
Merged
inactive handlers staying at finished state
#2738