FIX: Better IIR handling

Closes #912.