fix warning
merge trunk