Added fix and listener