fix #679