fixed issues in v0.2