fix #2246, try to fix #2244