Fixing template use