Fixed compile error due to rebasing on master