Fixing explicit instantiation