D31_0452 fixed