Fix bug and remove downsampling