try to fix #2