Fix import bug
Merge pull request #2124 from erwinwinder/master

Fix import bug