fixed conditional test