fix #1536