is this TODO still needed?  did you already fix this for v0.8.x and v0.10.x?