change template class to non-template class