Fix template for 1406
Fixes on 1409 templates