try to fix #51