D31_0410 fixed