Fixed bug with import