Fixing QAV shaper.