Fix input for 0.9.x?