frgments: switchable containers wait fix