Fixed warning: '&&' within '||' [-Wlogical-op-parentheses]