Applied the multilink fix to arch branch, see #92