core: fix #20