avoid use of deprecated code