patch for Release 0.7.0