Fix for build failure caused by PR #2870