Fix issue with listener added to a non-component