Retab changes for PR #1373