Fix height templates behavior