Fixed Bug on template for collector