replicate #775 pr