make compatible with 7.8.2