Fixed entity references