fixed conditional statements