try to fix #58