fix #558