make compatible with 1.4