Fixing templates