fix for mantis 3544. see note 14731.