fixing #21

fixed #21