fix #678