Fixed a small implementation bug, missing template call elements