Related container fix