Handling 0.9.x better