Remove hack for nameref because it can cause problems