Second attempt to fix ROA template