fixed 2 bugs with the crushing of data

fixed