Fixed wrong template call
Merge branch 'hotfix/v1.1.5'