Fixed current matches saving