subsampling fixes