Fixes: #2731 fixing template in 1.0.8