Workaround for merge issue.