more fix 17401 2