make compatible with 1.0.3