Fixed templatelistener removal
Merge pull request #307 from frmwrk123/prepare/101

Fixed templatelistener removal