Bug fixed on template from shipping