Fix for build with 4.8