Improved RPC desegmentation