fix #537