Bugfix preventing variables to be potentially unbound if flexibility …

Jerome Hilairerequested to merge
github/fork/merfort/develop into develop

Created by: merfort

…tax is switched off

Merge request reports