Basic GenContainer fix