Add back in extra fire of listeners - removing broke things.