try fix #8