resolve #787