bug fix #126 #103 #67