post11 fixes
merge fix