fixing #19