Rxfix

see checkin comment for details :)