Fix: Bad merge (missing last line) from master

Original commit: 41ef98ca4e1f5
Fix: Don't assume that 'conditions' is an array