Manually apply #18