feat(interchange): fix bugs #21 (2nd update)