Bug fix for invalid basepath in certain cases