Fix #5 - Fix listener issue