make compatible with 0.6.2+