fix #108
Update for v3.6.1