Fix https://acsmine.tok.access-company.com/redmine/issues/18436