Fixed controller listeners