work with 0.3.2.0_r17657