fix #573