Patch for 0.7.00