No more empty entries