fix RTS handling - part I
fix RTS handling - part II