fixed immediate change of template