fixed to works on 0.8.x