fix with changes done in 0.8,0.9,0.10