Attempted fix for conditional issue