Fix regression in Reference mapping