Fixed Boolean bug