fixed #141 #87