fixing #26