Fix listeners ... i broke them ....