Add logic to check if bond is correct in the end

Reviewer: trivial