Adopt to safe 0.1.x