path improved to remove problems with double import