Fixing breaking templates