Fixed issue with listener dereferencing.