Post template fix