Added support for target bonds that cross cell boundary