Request/pr 95

RPV-160 Fix fir complication errors.