Issue #35: Remove duplicate if statement