#13579 fix