Fix master slave