fixed Template instantiation.