More robust fix to "_:" bnode reference