fix conditional