v0.95 Bug fixed