Fixed template listener.
Merge pull request #86 from frmwrk123/fix/templateListener

Fixed template listener.