implement mantis 3790 note 14907