Fixed bug in Bond