Get rid of deprecation issue