fixed #115 #116