Fix async DB save issue