Fixes templatelistener removal.
Merge pull request #306 from frmwrk123/prepare/101

Fixes templatelistener removal.