Fixed post-merge compilation error