resolve #663