Fixed Boolean-Bug