Fix for dynamic template text