Bug fix on paths