fix exclude bugs