templates fix for d9e235659033934e5ec88bb018f4590b286ae288