working on isue #32