Change because of deprecation warning