GH-18 Bugfix: enable if condition check