partial fix #15