Fix drawing for pre-indexed