Tweak to #1588 fix