fix #1593