Fix for empty containers