Fixed the path problems