Fix issue with relative path and backward compatibility