fix #209
open #87