Assume this is fixed, as in master branch.