I think this fixes most of the quantize issues....