Fixing import step dependency. This close #2