Resolve duplicate id, fix #30 and #31