fix #543