Shouldn't this be conditional?