Fixed broken container, resolves #39