Fix #1822 with the help of the latest ACR