Small tweak, use simpler logic for conditional