ITS#7553 better fix