re-added missing embedded conditional