Corrected in 8.5 branch