don't need to specially handle these cases anymore