Another patch following APR-165