Fixed 2.9.X build error (after last change)