correcting other templates as well