fix compiler crash
merge