Fix based on an updated version from the source project.