Fix master storage