extension fixes
merge