Fixed build on branch 1.15