hopefully fixing some issues with saving