Fix multiple masters