Added a container... apparently we need that.
Fix the endless looping