Fixed bug with imports (again)