Hackish fix for path.join :(