FIX: check for blank containers