closed #1010
fix #1010 #950