fix conditional issue