Fixing database swap system