fix for the structure and template