revise link order to fix issue #6