Fixing the Master