fixed #30 #29