fixed conditional dependencies