BUG: fixed compile error after merge with trunk