Possible fix for level save issues, related to #1985 #1982 #1758