Patch for issue GROOVY-7226