Tried to fix listener, but broke somethin.