fix #589