fix #518