Fixed bug for boolean variables