Fix build after merge of PR #2269