this addresses #32