fix import order to prevent deprecation warnings