Fix listener hooks