Fixing the template issue as stated in issue #9