Fix paths #3