v0.95 fixed