Bugfix & allow multi-container on the craft version