Fix for possible broken paths