fixing #21