Added support for unclear target addresses