Fix work with empty containers
Small fix