fix conditional again