Fix import step registration to avoid running it twice
Flake8