#6429 fixed?