TESB-8373, fix again