fixing issues with local import