Patch for 0.0.7