avoid use of the sierra namespace (although the include "sierra.h" is working,
    the namespace was not declared)
adapted the condition to have short-circuit eval in the condition of the
conditional