Fix master implementation