fixed dead ref
merge