fixed conditional comments