Possible other fix for boolean issue