Fixing baseline/extention loading 2