Issue #18: fix lib order