Fixing issue with paths - hopefully