correct save handling