fixes #13391899580503