Applied last fix also to template