Rheia: fix regression while fixing save handling