Fixes #21, order of links