Temporary fix to build with 7.8.1