try fix #2