fixed conditional variables