Fix: Logical operators should be avoided (fixes #18)