Changed the template controller and it should work properly now.
Resolved merge