Fix for slow save & quit