reproduce fixes