FIX: Better IIR handling