#9 Fixed bug with import