fix conditional args