Fix to match mode changes