better rx handling