Attempted another fix for conditional issue