fix compile error
merged