Bug #1224: Changed fix to potentially allow for language independent saves