Fix container not set (yet) Fix #396