partial 5.8 support