Fix with templates