fix #580