Fix for when conditional is a simple bool already

Fixes #1983.
Merge branch 'devel' into HEAD