Bond setting fix