avoid triggering issue 13745 in further improvements to come