fix to v0.6.1