manually merged #19