revert more isEmpty calls