fixing conditional