7.0 fix build