Tweak related to #2699