Improve threading of bondeds