fixed conditional bug some more