Fixed compile error with new Common