fix after 12390/12391