Fix: use proper element type