Flag container fix