fixed conditional links