fix #681
fix #681
Merge pull request #862 from fabiobatalha/tk861

fix #861