The only way to "fix" the problem is to eliminate the ST from SW canon. What they did was completely indefensible and morally reprehensible. They can't walk this dig backwards and ever make fans accept Rey or their pathetic story line.