added 7.8 support