Fix inconsistency
Register missing listeners