fix #571