Quick cherry pick fix