fix #646