after merge fix v0.4.0