fixed issue/#25