#279 Fix paths