[FIX] Duplicate Conditionals

Fixes #1690