better handling on template for angles