fixing conditional, maybe?