fix #31 more