restructure: fix #123