fix and update patch for f18