Import bug fix
Merge pull request #794 from swuest/CleaneUp_CLI_V2

CLI import bug fix