D-16104 fixed?