this conditional seems redundant given the one above?