first try to fix #17