Fixing baseline/extention loading