fix container keys