adapt to famous 0.3.1