Conditional logic continues to fail