fixed more empty index errors