fixing rx bugs