try to make compatible with 1.9...