fix #670