Client Template Fix