fixed: #95 #106