Patch for Release 0.7.9