this is a better fix for the detached RCS issue.