Fixed boolean issue