Fixing template issue