extendedMode fix