fixed conditional get