Fix issue to 0.1.30