Removed index out of bounds