boolean issue fix