removed more deprecation warning