fixed compile error, after merge