Does F1 need a safety car rule rethink?

No one in F1 wants to see races to finish under the safety car, yet the current rule book means it will likely happen again. Is there another way?