fixed dependency/import problem