fix #1016