fix BC concerns - part 2. refs #2043 ping @cmfcmf