Try to make compatible with 6.2.