patch for v0.5