Bug fix for paths