Bugfix simple conditional

Merged Hellmich, Christoph requested to merge BUGFIX-SimpleConditional into master

🐛

Merge request reports