fixing #25