Fixed #8001029873311 on my test commit